mm/page_alloc: Avoid ABI change in 4.9.65
authorBen Hutchings <ben@decadent.org.uk>
Wed, 29 Nov 2017 20:05:45 +0000 (20:05 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 23 Dec 2017 00:39:51 +0000 (00:39 +0000)
Commit d135e5750205 "mm/page_alloc.c: broken deferred calculation"
renamed pglist_data::static_init_size to static_init_pgcnt.  However
the field has the same semantics as were intended originally (and in
any case, the field is only used by built-in code).  Hide the renaming
from genksyms.

Gbp-Pq: Topic debian
Gbp-Pq: Name mm-page_alloc-avoid-abi-change-in-4.9.65.patch

include/linux/mmzone.h

index fff21a82780cf9e77991b655d04633ca5151c70d..84563a4c2f69c6181513548091381ece94905ded 100644 (file)
@@ -673,7 +673,11 @@ typedef struct pglist_data {
         */
        unsigned long first_deferred_pfn;
        /* Number of non-deferred pages */
+#ifndef __GENKSYMS__
        unsigned long static_init_pgcnt;
+#else
+       unsigned long static_init_size;
+#endif
 #endif /* CONFIG_DEFERRED_STRUCT_PAGE_INIT */
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE